Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 9 Feb 2012 16:19:43 +0000 (08:19 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 9 Feb 2012 16:19:43 +0000 (08:19 -0800)
commita45e287c98cf98f55e1e972fc1e90c2c2d0e68e0
treed6890cc55d1384d226154397ec44998afd430051
parentf33489ad368f73f484f11079702a6d747a5a02e9
parent72f924454ac6afb0cb179ef912d4207a85ac2c2c
Merge from trunk.